feat: add sockPort options in queryString #1792

zhangyuang · 2019-04-11T07:26:57Z

For Bugs and Features; did you add new tests?

in tests/client.test.js

Motivation / Use-Case

i find webpack-dev-server start socketjs/client and the port use location.port
if only client side rendering it's ok
but i use server side rendering, so i have two ports with server: 7001, client:8080
when i open localhost:7001 sockjs-node send websocket request to ws://localhost:7001
but in fact it should send websocket request to ws://localhost:8080
so i feel the port will be webpack-dev-server start port and not location.port
so i add a sockPort option which we can custom sockJs port

Breaking Changes

No

Additional Info

jsf-clabot · 2019-04-11T07:26:59Z

All committers have signed the CLA.

zhangyuang · 2019-04-11T09:54:25Z

this checks were not successful don't look like from my modify
i exec npm run test on master has same error

alexander-akait · 2019-04-11T11:09:01Z

Please accept CLA

alexander-akait

Can you provide minimum reproducible test repo too

alexander-akait · 2019-04-11T11:09:58Z

client-src/default/index.js

@@ -221,7 +221,8 @@ if (
 ) {
  protocol = self.location.protocol;
 }
-
+// for server side rendering
+port = SOCKJS_PORT || port; // eslint-disable-line


We have https://webpack.js.org/configuration/dev-server/#devserversockpath i think we need implement socksjsPort option here

wait a minutes i will provide a minimum reproducible test repo
your idea is add a socksjsPort options?

https://github.com/zhangyuang/egg-ssr
@evilebottnawi
this is the minimum reproducible test repo
and i use this changes to a single webpack-dev-server named yumi-webpack-dev-server temporary

Yes, we already have path, but you try to use port in sockPath?

i don't use sockpath now, i don't know whether i can use port in sockPath
i find socket port use location.port now, but i hope use webpack-dev-server listen port
because in ssr,the tab i opening is start by my own node server not webpack-dev-server

alexander-akait · 2019-04-11T11:11:12Z

this checks were not successful don't look like from my modify
i exec npm run test on master has same error

because you break client

alexander-akait · 2019-04-11T11:11:35Z

lib/utils/addEntries.js

+        }
+        return item;
+      });
+    }


Remove this it is invalid

i also think it is invalid
but when i commit eslint promot arrow function must have a return value -。-

No it is invalid code all 😄

already remove

alexander-akait · 2019-04-11T11:54:14Z

Example of same PR, just add sockPort

zhangyuang · 2019-04-11T11:58:10Z

Example of same PR, just add sockPort
emmm,my english is poor, your idea is add a option named sockPort not socksjsPort ?

alexander-akait · 2019-04-11T12:20:30Z

Yes use sockPort

zhangyuang · 2019-04-11T12:21:12Z

Yes use sockPort

already modify and commit

alexander-akait · 2019-04-11T12:29:25Z

Please just add sockPort option like we do this in PR what i provide above, it is very easy

zhangyuang · 2019-04-11T13:59:48Z

Please just add sockPort option like we do this in PR what i provide above, it is very easy

whether i only add the option in options.json is ok?
in client, we can't read the options directly,only use defineplugin

alexander-akait · 2019-04-11T14:01:32Z

No, please look in code in PR above we send sockPath using query params, also we need tests

zhangyuang · 2019-04-11T14:04:16Z

No, please look in code in PR above we send sockPath using query params, also we need tests

ok,iknow your means ,thanks

zhangyuang · 2019-04-12T05:46:24Z

No, please look in code in PR above we send sockPath using query params, also we need tests

please check whether the modify is true, i add the test in client.test.js
thanks very much

codecov · 2019-04-12T06:13:15Z

Codecov Report

Merging #1792 into master will decrease coverage by 0.1%.
The diff coverage is 66.66%.

@@            Coverage Diff             @@
##           master    #1792      +/-   ##
==========================================
- Coverage   87.68%   87.58%   -0.11%     
==========================================
  Files           9        9              
  Lines         593      596       +3     
  Branches      177      179       +2     
==========================================
+ Hits          520      522       +2     
- Misses         61       62       +1     
  Partials       12       12

Impacted Files	Coverage Δ
lib/utils/addEntries.js	`100% <100%> (ø)`	⬆️
lib/utils/createConfig.js	`94.62% <50%> (-0.99%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 59773d3...5eec28a. Read the comment docs.

alexander-akait · 2019-04-12T10:47:37Z

test/Client.test.js

@@ -100,7 +101,7 @@ describe('Client complex inline script path', () => {
          )
          .then((requestObj) => {
            expect(requestObj.url()).toMatch(


Don't modify existing tests, please add new

ok, wait a minutes
thanks for your enthusiasm

already add a new test
maybe it is complicated due to lack of test practice

Don't worry code looks good so wait CI green and CLA

alexander-akait · 2019-04-12T12:05:14Z

Looks good, please accept CLA, you commit containt other email than you use for push, you need setup email in git and do force push when accept CLA and we can merge

alexander-akait · 2019-04-12T13:00:09Z

CLA accepted thanks!

alexander-akait · 2019-04-12T13:02:06Z

client-src/default/index.js

  // If sockPath is provided it'll be passed in via the __resourceQuery as a
  // query param so it has to be parsed out of the querystring in order for the
  // client to open the socket to the correct location.
  pathname:
    urlParts.path == null || urlParts.path === '/'
      ? '/sockjs-node'
-      : querystring.parse(urlParts.path).sockPath || urlParts.path,
+      : querystring.parse(urlParts.path).sockPath || '/sockjs-node',


I think it is breaking change, why you change this? I think it should be urlParts.path and for port urlParts.port

because if you add sockPort and not add sockPath
the urlParts.path is '/&sockPort=8080' !== '/'
so the expression's result is urlParts.path is error

Make sense 👍

I think it is breaking change, why you change this? I think it should be urlParts.path and for port urlParts.port

ok, i know your means is sockPort use urlParts.port,it's my problem, i will modify it now,
and i find someting problem in accept cla

CLA is ok:

licence/cla — Contributor License Agreement is signed.

thanks for your reply because it's so late

CLA is ok, just fix it and we merge this in near future, thanks for PR

already use previous behavior and return querystring.parse(urlParts.path).sockPath || urlParts.path

CLA is ok, just fix it and we merge this in near future, thanks for PR

why createConfig.js not have
if (argv.sockPath) {
options.sockPath = argv.sockPath;
}
it is a bug?

Oh, looks yes, let's do this in other PR 👍

yeah, at this pr

alexander-akait · 2019-04-13T15:40:32Z

client-src/default/index.js

 // check ipv4 and ipv6 `all hostname`
-if (hostname === '0.0.0.0' || hostname === '::') {
+if ((hostname === '0.0.0.0' || hostname === '::') && !sockPort) {


Why? We need test on this

oh~~~,i misunderstand his idea

Please revert and keep this PR as is. Other fixes/features will be do in other PRs

Please revert and keep this PR as is. Other fixes/features will be do in other PRs

already revert

alexander-akait

Thanks

pedrofurtado · 2019-04-16T16:23:14Z

@evilebottnawi Because of this PR is related to this another PR ( #1664 ), it is better to include it in 3.3.2 or 3.4.0 version?

alexander-akait · 2019-04-16T16:45:21Z

3.4.0

hiroppy

seems good, thx!

adarrra · 2019-04-22T13:53:40Z

I also need this option, not for ssr though, thanks @zhangyuang and @evilebottnawi !

pedrofurtado · 2019-04-25T17:08:58Z

@evilebottnawi Thanks for this PR and work of all 🎉 ! We are waiting the release with this fix, to finish the discussion opened in this another PR ( #1664 ) and this issue ( #1777 ) 👍

Until resolve server port bug. webpack/webpack-dev-server#1664 webpack/webpack-dev-server#1792

ISSUE: #1777 REF: #1792 REF: #1664

ref: webpack/webpack-dev-server#1792

zhangyuang requested review from alexander-akait and hiroppy as code owners April 11, 2019 07:26

alexander-akait requested changes Apr 11, 2019

View reviewed changes

zhangyuang changed the title ~~feat: ssr socket-js port~~ feat: add sockPort options in queryString Apr 12, 2019

alexander-akait reviewed Apr 12, 2019

View reviewed changes

alexander-akait mentioned this pull request Apr 12, 2019

V3.3.0 live reload broken when set hostname to 0.0.0.0:xxxx #1777

Closed

2 tasks

alexander-akait reviewed Apr 13, 2019

View reviewed changes

feat: add sockPort option in querystring

fb5a051

alexander-akait approved these changes Apr 13, 2019

View reviewed changes

Merge branch 'master' into features/socket-js-port

5eec28a

alexander-akait mentioned this pull request Apr 16, 2019

Use location.port when location.hostname is used to infer HMR socket URL #1664

Merged

6 tasks

hiroppy approved these changes Apr 16, 2019

View reviewed changes

alexander-akait merged commit 58d1682 into webpack:master Apr 16, 2019

zhangyuang mentioned this pull request Apr 17, 2019

dev-server default port is not added any more symfony/webpack-encore#565

Open

AndreiRailean mentioned this pull request Apr 18, 2019

sockjs-node gives 404 after upgrade to v3. (wp v3 -> wpv4). wds not serving up html files #1802

Closed

1 task

shimbaco added a commit to annict/annict that referenced this pull request Apr 27, 2019

Fix webpack-dev-server version to 3.2.1

40f4369

Until resolve server port bug. webpack/webpack-dev-server#1664 webpack/webpack-dev-server#1792

hiroppy added a commit that referenced this pull request May 1, 2019

fix(client-src): don't use self.location.port

9405169

ISSUE: #1777 REF: #1792 REF: #1664

hiroppy mentioned this pull request May 1, 2019

fix(client-src): don't use self.location.port #1838

Merged

6 tasks

hiroppy added a commit that referenced this pull request May 7, 2019

fix(client-src): don't use self.location.port

90029fd

ISSUE: #1777 REF: #1792 REF: #1664

hiroppy added a commit that referenced this pull request May 7, 2019

fix(client-src): don't use self.location.port

00aeb7b

ISSUE: #1777 REF: #1792 REF: #1664

hiroppy added a commit that referenced this pull request May 7, 2019

fix(client-src): don't use self.location.port

9bd51e7

ISSUE: #1777 REF: #1792 REF: #1664

hiroppy added a commit that referenced this pull request May 7, 2019

fix(client-src): don't use self.location.port (#1838)

6d31984

ISSUE: #1777 REF: #1792 REF: #1664

tsewaiho mentioned this pull request Jun 4, 2019

Bump webpack dev server to version 3.4 or above to support sockPort option quasarframework/quasar#4293

Closed

snyk-bot mentioned this pull request Aug 30, 2019

[Snyk] Upgrade webpack-dev-server from 3.2.1 to 3.8.0 iliutastoica/casino-demo-vue-search#4

Closed

ikobe-zz pushed a commit to umijs/umi that referenced this pull request Oct 14, 2019

fix: webpack dev server sock port

1a5062d

ref: webpack/webpack-dev-server#1792

ikobe-zz mentioned this pull request Oct 14, 2019

fix: webpack dev server sock port umijs/umi#3430

Closed

4 tasks

jkrehm mentioned this pull request Dec 6, 2019

feat(client): allow sock port to use browser location's port #2341

Merged

6 tasks

baxtergu mentioned this pull request Jun 24, 2021

server-utils 里的 webpack-dev-server-ssr 依赖相较于 webpack-dev-server 修改内容的记录 zhangyuang/ssr#70

Closed

feat: add sockPort options in queryString #1792

feat: add sockPort options in queryString #1792

Conversation

zhangyuang commented Apr 11, 2019 • edited Loading

For Bugs and Features; did you add new tests?

Motivation / Use-Case

Breaking Changes

Additional Info

jsf-clabot commented Apr 11, 2019 • edited Loading

zhangyuang commented Apr 11, 2019

alexander-akait commented Apr 11, 2019

alexander-akait left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait commented Apr 11, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait commented Apr 11, 2019

zhangyuang commented Apr 11, 2019

alexander-akait commented Apr 11, 2019

zhangyuang commented Apr 11, 2019

alexander-akait commented Apr 11, 2019 • edited Loading

zhangyuang commented Apr 11, 2019

alexander-akait commented Apr 11, 2019

zhangyuang commented Apr 11, 2019

zhangyuang commented Apr 12, 2019 • edited Loading

codecov bot commented Apr 12, 2019 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait commented Apr 12, 2019

alexander-akait commented Apr 12, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhangyuang Apr 12, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhangyuang Apr 12, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait Apr 13, 2019 • edited Loading

Choose a reason for hiding this comment

zhangyuang Apr 13, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait Apr 13, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexander-akait left a comment

Choose a reason for hiding this comment

pedrofurtado commented Apr 16, 2019

alexander-akait commented Apr 16, 2019

hiroppy left a comment

Choose a reason for hiding this comment

adarrra commented Apr 22, 2019

pedrofurtado commented Apr 25, 2019 • edited Loading

zhangyuang commented Apr 11, 2019 •

edited

Loading

jsf-clabot commented Apr 11, 2019 •

edited

Loading

alexander-akait commented Apr 11, 2019 •

edited

Loading

zhangyuang commented Apr 12, 2019 •

edited

Loading

codecov bot commented Apr 12, 2019 •

edited

Loading

zhangyuang Apr 12, 2019 •

edited

Loading

zhangyuang Apr 12, 2019 •

edited

Loading

alexander-akait Apr 13, 2019 •

edited

Loading

zhangyuang Apr 13, 2019 •

edited

Loading

alexander-akait Apr 13, 2019 •

edited

Loading

pedrofurtado commented Apr 25, 2019 •

edited

Loading